Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 8 Jun 2010 13:59:22 +0000 (13:59 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 8 Jun 2010 13:59:22 +0000 (13:59 +0000)
commit9619b4e86b5c5259a9660a73f82122cb29c723fc
tree78d2c27ea3e7eeb7b505fa42206823e97c858740
parent96e1af7620379391da84e95a4b5b919e90c90f04
parentcef5ef6c78befb7b41241d049649cebd52b2153f
Merge from mainline.